Skip to content

[OSDOCS-19678]: HCP etcd snapshot release note - #112509

Merged
lahinson merged 1 commit into
openshift:mainfrom
lahinson:osdocs-19678-hcp-etcd-snapshot-rn
Jun 11, 2026
Merged

[OSDOCS-19678]: HCP etcd snapshot release note#112509
lahinson merged 1 commit into
openshift:mainfrom
lahinson:osdocs-19678-hcp-etcd-snapshot-rn

Conversation

@lahinson

@lahinson lahinson commented May 29, 2026

Copy link
Copy Markdown
Contributor

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 29, 2026
@lahinson lahinson added this to the Planned for 4.22 GA milestone May 29, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented May 29, 2026

Copy link
Copy Markdown

🤖 Fri May 29 18:17:29 - Prow CI generated the docs preview:

https://112509--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-release-notes.html

Comment thread modules/hcp-release-notes-new-features.adoc
Comment thread modules/hcp-release-notes-new-features.adoc Outdated
@lahinson lahinson closed this May 29, 2026
@lahinson lahinson reopened this May 29, 2026
@lahinson
lahinson force-pushed the osdocs-19678-hcp-etcd-snapshot-rn branch from fbcd56b to a191419 Compare May 29, 2026 18:07
Comment thread modules/hcp-release-notes-new-features.adoc
@openshift-ci

openshift-ci Bot commented May 29, 2026

Copy link
Copy Markdown

@lahinson: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jeana-redhat

Copy link
Copy Markdown
Contributor

The branch/enterprise-5.0 label has been added to this PR.

This is because your PR targets the main branch and is labeled for branch/enterprise-4.22. And any PR going into main must also target the latest version branch (branch/enterprise-5.0).

If the update in your PR does NOT apply to version 5.0 onward, please re-target this PR to go directly into the appropriate enterprise- version branch or branches instead of main.

@mgencur

mgencur commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

LGTM from QE

@lahinson lahinson added merge-review-needed Signifies that the merge review team needs to review this PR do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 11, 2026
@dfitzmau dfitzmau added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jun 11, 2026
@dfitzmau

Copy link
Copy Markdown
Contributor

Nice work. LGTM.

I'm assuming a CM is not needed as the HCP release comes after the OCP core release?

@dfitzmau dfitzmau removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jun 11, 2026
@lahinson

Copy link
Copy Markdown
Contributor Author

I'm assuming a CM is not needed as the HCP release comes after the OCP core release?

Correct. Thanks, @dfitzmau!

@lahinson
lahinson merged commit 65b2fdd into openshift:main Jun 11, 2026
2 checks passed
@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown

@lahinson: #112509 failed to apply on top of branch "enterprise-4.22":

Applying: HCP etcd snapshot release note
Using index info to reconstruct a base tree...
M	modules/hcp-release-notes-new-features.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-release-notes-new-features.adoc
CONFLICT (content): Merge conflict in modules/hcp-release-notes-new-features.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 HCP etcd snapshot release note

Details

In response to this:

/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.22 do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants